Make all test failures non-fatal at build time, so that intermittent test failures...

diff --git a/debian/changelog b/debian/changelog
index a723b0d46350ba0ed89fa758e2481be1cb9c77ef..2a64c3c715679713b65a68272571b9412a7d176d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ostree (2016.15-2) UNRELEASED; urgency=medium
+
+  * Make all test failures non-fatal at build time, so that intermittent
+    test failures do not interfere with possible security updates during
+    Debian stretch-as-stable.
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 20 Dec 2016 11:27:13 +0000
+
 ostree (2016.15-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/test.sh b/debian/test.sh
index caeaf1698b9d7a8cac615a6b9cdd7950a3fbcadb..4a8f2b6e5363055e33da688508bdf94bb9b05990 100755 (executable)
--- a/debian/test.sh
+++ b/debian/test.sh
@@ -2,14 +2,6 @@
 
 set -e
 
-ignore=
-
-case "$DEB_HOST_ARCH" in
-    (mipsel)
-        ignore=yes
-        ;;
-esac
-
 export VERBOSE=1
 
 try_tests=5
@@ -17,7 +9,7 @@ try_tests=5
 failed=0
 make check || failed=1
 
-if [ "$failed" -gt 0 ] || [ -n "$ignore" ]; then
+if [ "$failed" -gt 0 ]; then
     [ "$failed" -eq 0 ] || echo "Test failed! Checking how reproducible it is..."
     for i in $(seq 1 "$(( $try_tests - 1 ))"); do
         if ! make check; then
@@ -37,15 +29,10 @@ fi
 # There are several race conditions that cause intermittent failures.
 # They are not actually a regression - we've just been luckier in the
 # past - so let newer versions build reliably.
-if [ "$failed" -gt 2 ]; then
-    echo "Failed $failed out of $try_tests test runs"
-    if [ -z "$ignore" ]; then
-        exit 1
-    else
-        echo "Ignoring test failure for this architecture"
-    fi
-elif [ "$failed" -gt 0 ]; then
+if [ "$failed" -gt 0 ]; then
     echo "Failed $failed out of $try_tests test runs; continuing anyway"
+else
+    echo "All tests passed"
 fi
 
 exit 0